Update callers

Adapt all our tests and examples to the new initialization api.

diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c
index a3bc6568fa7dba93461f31ede0bc9e8531310e29..d61eb394c88d9be88e5186501215a762505701c2 100644 (file)
--- a/docs/tools/shooter.c
+++ b/docs/tools/shooter.c
@@ -302,7 +302,7 @@ int main (int argc, char **argv)
 {
   /* If there's no DISPLAY, we silently error out.  We don't want to break
    * headless builds. */
-  if (! gtk_init_check (&argc, &argv))
+  if (! gtk_init_check ())
     return 0;
 
   toplevels = get_all_widgets ();

diff --git a/examples/builder.c b/examples/builder.c
index a05646fdbeae95905b501639d6563f3cab26eee4..d732068383c7952373bfb3de31ac03a032de1341 100644 (file)
--- a/examples/builder.c
+++ b/examples/builder.c
@@ -15,7 +15,7 @@ main (int   argc,
   GObject *window;
   GObject *button;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* Construct a GtkBuilder instance and load our UI description */
   builder = gtk_builder_new ();

diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c
index 0a22d00213931947bc1ec3e5b510e5dc60d766fd..d75d7660310bbb4eee853c580cdfca1c0b20ddce 100644 (file)
--- a/gtk/gtk-builder-tool.c
+++ b/gtk/gtk-builder-tool.c
@@ -1071,7 +1071,7 @@ main (int argc, const char *argv[])
 {
   g_set_prgname ("gtk-builder-tool");
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   gtk_test_register_all_types ();
 

diff --git a/gtk/gtk-launch.c b/gtk/gtk-launch.c
index bf84ad614a1db834bccc1703b1c3e2c8b6af6c25..76a95e46c5ecf156b93c47780ff67339a93a0c7b 100644 (file)
--- a/gtk/gtk-launch.c
+++ b/gtk/gtk-launch.c
@@ -114,7 +114,7 @@ main (int argc, char *argv[])
     }
 
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   app_name = *args;
 #ifdef G_OS_UNIX

diff --git a/gtk/gtk-query-settings.c b/gtk/gtk-query-settings.c
index 29ae214dc55406af493b2e7f1789e1d3f8447ce7..6a025f5899f6f7f41be820a521b750660b70113f 100644 (file)
--- a/gtk/gtk-query-settings.c
+++ b/gtk/gtk-query-settings.c
@@ -30,7 +30,7 @@ main (int argc, char **argv)
   int           max_prop_name_length = 0;
   gchar        *pattern = NULL;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (argc > 1)
     pattern = argv[1];

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index a1b2271cab6a8ba61132df337ebddab018c23f95..ff70808584456338dfadd509b2ff7d6fc085ab45 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -290,7 +290,7 @@ gtk_application_startup (GApplication *g_application)
 
   gtk_action_muxer_insert (application->priv->muxer, "app", G_ACTION_GROUP (application));
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   application->priv->impl = gtk_application_impl_new (application, gdk_display_get_default ());
   gtk_application_impl_startup (application->priv->impl, application->priv->register_session);

diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index c85fa25782a2578d876ee0cc6d8b1db87beecbd4..30f5d9073ead30061886f8ac24a52d769fad1706 100644 (file)
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -96,7 +96,7 @@ gtk_test_init (int    *argcp,
    */
   gdk_disable_multidevice ();
 
-  gtk_init (argcp, argvp);
+  gtk_init ();
 }
 
 static gboolean

diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c
index f0f5269682d3e9d448ebebf560cedd80d4cd3461..5f686cef59b47dbfc1053b0d4ced94b603325c4f 100644 (file)
--- a/tests/animated-resizing.c
+++ b/tests/animated-resizing.c
@@ -173,8 +173,6 @@ main(int argc, char **argv)
   GOptionContext *context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, options, NULL);
   frame_stats_add_options (g_option_context_get_main_group (context));
-  g_option_context_add_group (context,
-                              gtk_get_option_group (TRUE));
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
@@ -182,6 +180,8 @@ main(int argc, char **argv)
       return 1;
     }
 
+  gtk_init ();
+
   g_print ("# Load factor: %g\n",
            load_factor);
   g_print ("# Resizing?: %s\n",

diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c
index 11b3f99bcede836b6cb73f8f87b83ea4ecb6419a..febfc002627f94b3ce39f2eb484cb86c2a97ef79 100644 (file)
--- a/tests/animated-revealing.c
+++ b/tests/animated-revealing.c
@@ -28,8 +28,6 @@ main(int argc, char **argv)
   GOptionContext *context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, options, NULL);
   frame_stats_add_options (g_option_context_get_main_group (context));
-  g_option_context_add_group (context,
-                              gtk_get_option_group (TRUE));
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
@@ -37,6 +35,8 @@ main(int argc, char **argv)
       return 1;
     }
 
+  gtk_init ();
+
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   frame_stats_ensure (GTK_WINDOW (window));

diff --git a/tests/flicker.c b/tests/flicker.c
index 4743eb8ea5b3653cfb1e2f1d5cf3f778bd2cef1d..85890f938e70874723cd6f8bb625496b0331ba5e 100644 (file)
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window1;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window1 = create_flicker ();
   gtk_widget_show (window1);

diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index 584c3fa16cc7adb15270cc3228701688bb5b5bec..19f8068f42a3b05087d494e953f9cdb100c05568 100644 (file)
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
     *revealer, *frame, *label, *scrolled, *popover;
   int i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_titlebar (GTK_WINDOW (window), g_object_new (GTK_TYPE_HEADER_BAR, "visible", TRUE, "title", "GdkGears", NULL));

diff --git a/tests/listmodel.c b/tests/listmodel.c
index 625a099270974b8b99efe06f86bc12bc01c1a728..1d98bc7fbaff1f28d0a25ff186c36886a176db10 100644 (file)
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -171,7 +171,7 @@ main (int argc, char *argv[])
   GListStore *store;
   gint i;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   store = g_list_store_new (my_object_get_type ());
   for (i = 0; i < 100; i++)

diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index e69956a25e7576671101d0318efd642e8274d12d..a49147ce6025d4d6f988c4ec30e61cd8522fa6e5 100644 (file)
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -43,7 +43,7 @@ main (int argc, char **argv)
   GtkWidget *scale;
   GtkWidget *da;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);

diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 4c3c641fac3045c1fd1875579bce8e409e857f1a..e1ec8b8272a90ec61edd0a2d5784624cb3a02a75 100644 (file)
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   GtkWidget *combo;
   GtkAdjustment *adj;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);

diff --git a/tests/print-editor.c b/tests/print-editor.c
index 27ebb674c5ea8b2590c216f1816849b6177b9991..cf79140f6bb528d97c7115c0b458726ecae3346f 100644 (file)
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -781,7 +781,7 @@ main (int argc, char **argv)
   GtkApplication *app;
   GError *error = NULL;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   settings = gtk_print_settings_new_from_file ("print-settings.ini", &error);
   if (error) {

diff --git a/tests/rendernode-create-tests.c b/tests/rendernode-create-tests.c
index 93d894396b92a11aa23d13c6638fd7e7e7b6f295..b55e76816edfd86acc765730636b5faab3b8ef2e 100644 (file)
--- a/tests/rendernode-create-tests.c
+++ b/tests/rendernode-create-tests.c
@@ -362,7 +362,7 @@ main (int argc, char **argv)
   char *pattern;
   guint i, n;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   n = 100000;
   pattern = "*";

diff --git a/tests/rendernode.c b/tests/rendernode.c
index 292be48fadbceeed4e72d81ac045f0af46c2eb49..f35f74c7bd4a852d9a1ccaa90a3699ac08d4a3fe 100644 (file)
--- a/tests/rendernode.c
+++ b/tests/rendernode.c
@@ -24,14 +24,18 @@ main(int argc, char **argv)
   char *contents;
   gsize len;
   int run;
+  GOptionContext *context;
 
-  if (!gtk_init_with_args (&argc, &argv, "NODE-FILE PNG-FILE",
-                           options, NULL, &error))
+  context = g_option_context_new ("NODE-FILE PNG-FILE");
+  g_option_context_add_main_entries (context, options, NULL);
+  if (!g_option_context_parse (context, &argc, &argv, &error))
     {
       g_printerr ("Option parsing failed: %s\n", error->message);
       return 1;
     }
 
+  gtk_init ();
+
   if (runs < 1)
     {
       g_printerr ("Number of runs given with -r/--runs must be at least 1 and not %d.\n", runs);

diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index 90be21b5531a100eafb351da4fcfdd6e1ff6e5e3..99b0fa47d91d347e4a55d7ab1543c7a08831e1e9 100644 (file)
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -105,8 +105,6 @@ main (int argc, char **argv)
   GOptionContext *context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, options, NULL);
   frame_stats_add_options (g_option_context_get_main_group (context));
-  g_option_context_add_group (context,
-                              gtk_get_option_group (TRUE));
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
@@ -114,6 +112,8 @@ main (int argc, char **argv)
       return 1;
     }
 
+  gtk_init ();
+
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   frame_stats_ensure (GTK_WINDOW (window));
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);

diff --git a/tests/simple.c b/tests/simple.c
index 30ebd1499ae9d10b519946399be40648074cc55f..b23350e178f712e66fa6e4a219c4a714ef15172b 100644 (file)
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = g_object_connect (g_object_new (gtk_window_get_type (),
                                            "type", GTK_WINDOW_TOPLEVEL,

diff --git a/tests/stresstest-toolbar.c b/tests/stresstest-toolbar.c
index ba10d73b5e2af584772fdb92599dcfca6b0a4a59..bab169f76bdf3cdfa352680582699c82c159faca 100644 (file)
--- a/tests/stresstest-toolbar.c
+++ b/tests/stresstest-toolbar.c
@@ -135,7 +135,7 @@ main (gint argc, gchar **argv)
 {
   Info info;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   info.toolbar = NULL;
   info.counter = 0;

diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 2824a89a6fa64bf75fc9d31747d87d16ea1db7c5..7797194edf85e4bf3ea2b841c3b0a6ec5dd545f0 100644 (file)
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
   GtkWidget *win, *box, *tv, *sw, *sb;
   GtkAdjustment *adj;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (win), 640, 480);

diff --git a/tests/testaccel.c b/tests/testaccel.c
index f3b64d13abee131fa4c7de05c2f6639ef4caa1e8..4f5c1fc4b4a86272a2f3c421e38f17e64afa873b 100644 (file)
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -121,7 +121,7 @@ main (gint argc, gchar **argv)
 {
   GtkWidget *dialog;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   dialog = key_test ();
 

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index f7f977267b72fad11547113d7ebd0615f1cef495..ac4fddbe6e5bc1fb8c0c7eeb4b4158324631228c 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -365,7 +365,7 @@ main (int argc, char *argv[])
 {
   GtkCssProvider *provider;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider,

diff --git a/tests/testanimation.c b/tests/testanimation.c
index 2dd60f910d3cc92b1c88a9f5c942f0861d3855d7..8c039516aece7c52ebd4c9ebb87254029fc396ce 100644 (file)
--- a/tests/testanimation.c
+++ b/tests/testanimation.c
@@ -410,7 +410,7 @@ main (int    argc,
 {
   gint i;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   i = 1;
   while (i < argc)

diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index 25666dfe8dae9889049eb9a763e769e728b6c82b..f4c3ff0548818f3509aa0b3c030724d8b7affd02 100644 (file)
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -157,7 +157,7 @@ main (int argc, char **argv)
   GtkWidget *w1;
   gchar *path;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   grid = gtk_grid_new ();

diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index bf37cd57c4b19b4809ac54a773c6093ca2836589..6ff01d11f8a4f1682917820afa91a725fde78b29 100644 (file)
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -68,7 +68,7 @@ main (int argc,
 {
   GtkWidget *w;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testassistant.c b/tests/testassistant.c
index 2e188bae383a658efd2448d2078e5d3c2d481f31..fd4074bf677dc6a87f01112dab81d7ea0ede5235 100644 (file)
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -703,7 +703,7 @@ main (int argc, gchar *argv[])
   GtkWidget *window, *box, *button;
   gint i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 30f4a1924a0715d15bb102d097abe18f314ab6aa..d402665b7c74834c16856244441a222e1c0d57c4 100644 (file)
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -76,7 +76,7 @@ main (int    argc,
   int i, j;
   GtkCssProvider *provider;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider,

diff --git a/tests/testbbox.c b/tests/testbbox.c
index 502914f1da50cd1af551fbd442149694b6b70e94..d137eb774c875ca8339088c349b48592c269cbc6 100644 (file)
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -118,7 +118,7 @@ main (int    argc,
   GtkWidget *vbox, *hbox, *combo_styles, *combo_types, *option;
   int i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL);

diff --git a/tests/testbox.c b/tests/testbox.c
index 6885f41b2e95834aab509aa31882fbcb99ce9315..1215d9c793ad8f3a74e417cdd9671de0376b8362 100644 (file)
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   GtkWidget *label;
   GtkWidget *spin;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index 517e530d1c577023b81f7f6a125b7a7724304cb4..451dbf2f9f33132761125064f06d9a612418bad1 100644 (file)
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -146,7 +146,7 @@ main (gint argc, gchar **argv)
   GtkStyleProvider *provider;
   GtkTextBuffer *css;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   css = gtk_text_buffer_new (NULL);
   gtk_text_buffer_create_tag (css,

diff --git a/tests/testbuttons.c b/tests/testbuttons.c
index 7217311b0021ece21d3f31515831a48738dc067e..6c58cb3b70433e876b8fb689ee2f9d75734b225c 100644 (file)
--- a/tests/testbuttons.c
+++ b/tests/testbuttons.c
@@ -27,7 +27,7 @@ int main (int argc, char *argv[])
        gboolean use_underline;
        GtkWidget *label;
 
-       gtk_init (&argc, &argv);
+       gtk_init ();
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testcairo.c b/tests/testcairo.c
index e2e22d874dbd8b6d3b495eeed42b8158444d46cc..e482bb33e9ab16c38a178c6b5600b0c732bf65aa 100644 (file)
--- a/tests/testcairo.c
+++ b/tests/testcairo.c
@@ -189,7 +189,7 @@ main (int argc, char **argv)
 {
   GtkWidget *window, *darea;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index aec6406d323e898c2cfe374df9b160b6445ad31e..4162a769d28911623dc5b257a5e1e773d3734650 100644 (file)
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -701,7 +701,7 @@ create_calendar(void)
 int main(int   argc,
          char *argv[] )
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("GTK_RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 7de3625435d8c9dd216dd88abbc0e6e6100c45b9..eae9f02c3f398b6395dde6ea316a087adc7cda1e 100644 (file)
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -614,7 +614,7 @@ background_area (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index c9648a52559ea6163c1e447e7ed7af3d506f12ac..1c82eb8e15b437e3c4e3ea0f2f716969bea795db 100644 (file)
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -254,7 +254,7 @@ main (int argc, char **argv)
   GtkWidget *label;
   GtkWidget *tree;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "destroy",

diff --git a/tests/testclipboard.c b/tests/testclipboard.c
index 010ee354f39e3c0a855c5860a61f726875ab9fe6..2ab4441ac2bb991b790468477c0403349a9a365d 100644 (file)
--- a/tests/testclipboard.c
+++ b/tests/testclipboard.c
@@ -109,7 +109,7 @@ main (int argc, char **argv)
 {
   GtkWidget *window;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_dialog_new_with_buttons ("Clipboard",
                                         NULL,

diff --git a/tests/testcolorchooser.c b/tests/testcolorchooser.c
index 4fb6354055790cd3c2f88ec384b0c83747ecf572..9457632a888ca3af9689159f84c4e99688f03050 100644 (file)
--- a/tests/testcolorchooser.c
+++ b/tests/testcolorchooser.c
@@ -36,7 +36,7 @@ main (int argc, char *argv[])
   GtkWidget *dialog;
   gint i;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   dialog = gtk_color_chooser_dialog_new ("Select a color", NULL);
 

diff --git a/tests/testcolorchooser2.c b/tests/testcolorchooser2.c
index c90962f55b6e87555c44f15e6964f05aa55a4ed1..a0c4f113ba6b9adf53dca8a851a6d568a0e7088e 100644 (file)
--- a/tests/testcolorchooser2.c
+++ b/tests/testcolorchooser2.c
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
   GtkWidget *entry;
   GtkBuilder *builder;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   builder = gtk_builder_new_from_file ("testcolorchooser2.ui");
   window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));

diff --git a/tests/testcombo.c b/tests/testcombo.c
index 2f334937689a36e3eade1eac9e8e0f3e92b8bcbb..9ea0ea636177baf9c77edcfd689ba6a387003059 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1058,7 +1058,7 @@ main (int argc, char **argv)
         gchar *text;
         gint i;
 
-        gtk_init (&argc, &argv);
+        gtk_init ();
 
        if (g_getenv ("RTL"))
          gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index b74477baa3488e424a917ce2a0924d40e924884b..4c8a8fa34ff26ff2071092e90e669689b10f0bd0 100644 (file)
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -234,7 +234,7 @@ main (int argc, char **argv)
   
   test_init ();
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   model = gtk_list_store_new (1, G_TYPE_STRING);
   contents = g_array_new (FALSE, FALSE, sizeof (char));

diff --git a/tests/testdialog.c b/tests/testdialog.c
index 0b90b69387249c02cdf7349e15676e8d456d8462..941acfdba178453cdacef8507215a641167e53bc 100644 (file)
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -316,7 +316,7 @@ main (int argc, char *argv[])
   GtkWidget *box;
   GtkWidget *button;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

diff --git a/tests/testdnd.c b/tests/testdnd.c
index 2011578f6dafb79fa78df5ed3724e9475945d253..083d0e2dba72112ac42fdb024914db1d476f5351 100644 (file)
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -590,7 +590,7 @@ main (int argc, char **argv)
 
   test_init ();
   
-  gtk_init (&argc, &argv); 
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "destroy",

diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index 2cccf04f9a46d9ab4497ed55dfc9cca61ceb9f4d..029c24d9f9c9d2ec8ac2643090ab7a252538dcac 100644 (file)
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -355,7 +355,7 @@ main (int argc, char *Argv[])
   GtkWidget *grid;
   GtkWidget *entry;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Drag And Drop");

diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index 52ea06f5d91cb0feb24d0462d90c91dc2eb8cac6..7749c8675b895691a6641e43fd40b862edb79a1f 100644 (file)
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   GtkWidget *window, *vbox, *label;
   GtkWidget *combo, *scale, *overlay, *da;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);

diff --git a/tests/testemblems.c b/tests/testemblems.c
index 3d8ee8091f42f13c6ebd10645f7fac3ea7d1372d..171d2a7f3a9373d26e56ab1f911a396f3941431c 100644 (file)
--- a/tests/testemblems.c
+++ b/tests/testemblems.c
@@ -8,7 +8,7 @@ int main (int argc, char **argv)
         GIcon *icon;
         GIcon *icon2;
 
-       gtk_init (&argc, &argv);
+       gtk_init ();
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 4bb0124e7c9b21e3b24d029b3eb6f11756f032a3..6bb4468da815bdbf3728ec4f4909b156b4ba6c1b 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -296,7 +296,7 @@ main (int argc, char *argv[])
   GtkTreeModel *completion_model;
   GtkCellRenderer *cell;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "delete_event", gtk_main_quit, NULL);

diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 1025c0a8066a8bda52abbb64f6a13ce3759c65e3..d5b20d5b1288b65469c8b3633df341ff0df06ae7 100644 (file)
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -108,7 +108,7 @@ main (int argc, char **argv)
   GIcon *icon;
   GtkTargetList *tlist;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Gtk Entry Icons Test");

diff --git a/tests/testerrors.c b/tests/testerrors.c
index 24dd5d3309f5669f83af89e9ebaa45416a5d2bd9..42cf8ff709a866d36b602036b15311a49850ef75 100644 (file)
--- a/tests/testerrors.c
+++ b/tests/testerrors.c
@@ -133,7 +133,7 @@ main (gint argc, gchar *argv[])
 {
   GdkDisplay *extra_display;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   test_error_trapping (gdk_display_get_default ());
 

diff --git a/tests/testexpand.c b/tests/testexpand.c
index 028b64c21606d692ad0304b049abbf75716efad5..750020bde1812f8af4550476f9acd21813b3bb41 100644 (file)
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -156,7 +156,7 @@ create_grid_window (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testexpander.c b/tests/testexpander.c
index 61329dca6c87b05656dc8310d451d996be33b9f6..286e479009ed91731a61824378947ddd44e8b0be 100644 (file)
--- a/tests/testexpander.c
+++ b/tests/testexpander.c
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
   GtkWidget *tv;
   GtkTextBuffer *buffer;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   dialog = gtk_message_dialog_new_with_markup (NULL,
                        0,

diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 6d31224226132c8056ca2dd8d4d85c0080eeeb8c..5cb628a1e251cd46c760000a4525f290a355e480 100644 (file)
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -540,13 +540,19 @@ main (int argc, char **argv)
     { "initial-folder", 'F', 0, G_OPTION_ARG_FILENAME, &initial_folder, "Initial folder to show", "FILENAME" },
     { NULL }
   };
+  GOptionContext *context;
 
-  if (!gtk_init_with_args (&argc, &argv, "", options, NULL, &error))
+  context = g_option_context_new ("");
+  g_option_context_add_main_entries (context, options, NULL);
+  if (!g_option_context_parse (context, &argc, &argv, &error))
     {
       g_print ("Failed to parse args: %s\n", error->message);
       g_error_free (error);
       return 1;
     }
+  g_option_context_free (context);
+
+  gtk_init ();
 
   if (initial_filename && initial_folder)
     {

diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 96deb114f381818676039537608be7a63a0feb51..74bc80a03020298442c526f67523f7f24923577a 100644 (file)
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -230,11 +230,10 @@ main (int   argc,
 
   context = g_option_context_new ("- test GtkFileChooserButton widget");
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-  g_option_context_add_group (context, gtk_get_option_group (TRUE));
   g_option_context_parse (context, &argc, &argv, NULL);
   g_option_context_free (context);
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* to test rtl layout, use "--right-to-left" */
   if (rtl)

diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 779ee4df4e3868efe0a61dd59888745993fcdd85..156a933d00e0e0e10030eef1d8846143d35d0f38 100644 (file)
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -666,7 +666,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = create_window ();
 

diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index 7ecab02d17b9063e4eacfb4657aa29634b4fe11b..13d19b3b33bb409dd6531c8840767dd94c247de2 100644 (file)
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
   GtkWidget *box;
   GtkWidget *fontchooser;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   fontchooser = gtk_font_chooser_widget_new ();
 

diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 2e2da14a37c365ce4ef65be9b21a0cc5ed762aa1..43ecaf067d439c03793a8d6e30dc3a1264f05698 100644 (file)
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
   GtkWidget *window;
   GtkWidget *font_button;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   font_button = gtk_font_button_new ();
 

diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c
index 7db27bcf7abdf6250edcff5eb602b7339a54b3c8..5e29ebc04628c731410001f361ca039e60c62577 100644 (file)
--- a/tests/testfontoptions.c
+++ b/tests/testfontoptions.c
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window, *label, *grid, *demo;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   grid = gtk_grid_new ();

diff --git a/tests/testframe.c b/tests/testframe.c
index ea241b4c3b892e4a5d561d421a65aa8a063765ff..8d6ea090869e0755651559db553e675b5e3c3e12 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -136,7 +136,7 @@ int main (int argc, char **argv)
   GtkWidget *xalign_spin, *yalign_spin, *button, *grid, *label;
   gfloat xalign, yalign;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);

diff --git a/tests/testfullscreen.c b/tests/testfullscreen.c
index 29e853a5791ccb801598ba84ce06f97124c278dc..9059f3b0778ec93c8806d932abda1a8b0b1fb355 100644 (file)
--- a/tests/testfullscreen.c
+++ b/tests/testfullscreen.c
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window, *vbox, *button;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testgaction.c b/tests/testgaction.c
index c9ae96ed5d053a9798dbb60983c0f1b5acec3c69..c45e3c45e32ace041b1f38b7b8946bfb8d7a7516 100644 (file)
--- a/tests/testgaction.c
+++ b/tests/testgaction.c
@@ -97,7 +97,7 @@ static const char *menu_data =
 
 int main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
   GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   GtkWidget *menubutton = gtk_menu_button_new ();

diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c
index ab52c978184396aa41ea9cc28c7239e4528360fc..5c406aac6618d78970ab3cad7837e75834a20b75 100644 (file)
--- a/tests/testgiconpixbuf.c
+++ b/tests/testgiconpixbuf.c
@@ -28,7 +28,7 @@ main (int argc,
   GEmblem *emblem;
   gchar *str;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   pixbuf = gdk_pixbuf_new_from_file ("apple-red.png", NULL);
   toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);

diff --git a/tests/testglarea.c b/tests/testglarea.c
index 187637d952d38ab4d5bb6a8b7b8ac1ffbb75fe71..08ed63ce73014726b84c50c50ae8677f3428560b 100644 (file)
--- a/tests/testglarea.c
+++ b/tests/testglarea.c
@@ -397,7 +397,7 @@ main (int argc, char *argv[])
   GtkWidget *window, *box, *button, *controls;
   int i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* create a new pixel format; we use this to configure the
    * GL context, and to check for features

diff --git a/tests/testglblending.c b/tests/testglblending.c
index bb3b186bdde002981f622846eb1565a51d66254f..d220ff8f0351e8619b65ae7044d1635900d80752 100644 (file)
--- a/tests/testglblending.c
+++ b/tests/testglblending.c
@@ -8,7 +8,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window, *fixed, *gears, *spinner;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Test GL/gtk inter-blending");

diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index c92b1439bc08012c8bf40622aed13be3ec0e647d..a0943c9ceb59185d1b2997b1897d8a314a126eee 100644 (file)
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -625,8 +625,12 @@ main (int argc, char *argv[])
     { "import", 0, 0, G_OPTION_ARG_NONE, &do_import, "Use exported actions and menus", NULL },
     { NULL, }
   };
+  GOptionContext *context;
 
-  gtk_init_with_args (&argc, &argv, NULL, entries, NULL, NULL);
+  context = g_option_context_new ("");
+  g_option_context_add_main_entries (context, entries, NULL);
+  g_option_context_parse (context, &argc, &argv, NULL);
+  gtk_init ();
 
   if (do_export && do_import)
     {

diff --git a/tests/testgrid.c b/tests/testgrid.c
index 37e2d79e78f0c10bed7e34ed483330078fdce052..eb0af50a78cda3b5c92355e3761b731645071fe8 100644 (file)
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -453,7 +453,7 @@ spanning_grid (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index 4b412d01ef1d92d1d757bdce5c5f056456b858f7..01f4a83f087c7d20054d265491ff8029eaf399b0 100644 (file)
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -105,7 +105,7 @@ main (int argc, char **argv)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   model = create_model ();
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index abefd0c8d4d51f00893e3bbe93efa3f98add0b4c..7e08e27dcb221ae1456b4788303c65b304b1a4c1 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8894,7 +8894,7 @@ main (int argc, char *argv[])
 
   g_set_application_name ("GTK+ Test Program");
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   provider = gtk_css_provider_new ();
 

diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index c766e4ce49352f3b0c7588f71c89a82d9d7e9523..57ed406503bb3c8ca70ff686b9fa2a5e66756bdb 100644 (file)
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
   GtkWidget *content;
   GtkCssProvider *provider;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_style_context_add_class (gtk_widget_get_style_context (window), "main");

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 444a2013708d39ed387ea6ee7ac6ba4eda5618d7..b1108388e4b6cdef804c459e64d264c687543586 100644 (file)
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -967,7 +967,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = create_window ();
 

diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index e7f10dff24dc827122348fb30ccb1cda16154a00..f34e93a9fdfb85fc0f03a18d007d2f97486066b4 100644 (file)
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
   int scale = 1;
   GtkIconLookupFlags flags;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (argc < 3)
     {

diff --git a/tests/testiconview-keynav.c b/tests/testiconview-keynav.c
index 98f662a285cf10625bc01dbdd58b326a1a52e518..5ab125361d7ec0b45f6d4b27d1947b5d36540455 100644 (file)
--- a/tests/testiconview-keynav.c
+++ b/tests/testiconview-keynav.c
@@ -235,7 +235,7 @@ main (int argc, char *argv[])
   GtkWidget *vbox;
   Views views;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   set_styles ();
 

diff --git a/tests/testiconview.c b/tests/testiconview.c
index 9cb5498fc4875059835a5d18eb4948650fd397e8..72f8fab5d1138a29c486e5e7414f3050138890d1 100644 (file)
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -420,7 +420,7 @@ main (gint argc, gchar **argv)
   GtkCellRenderer *cell;
   GtkTreeViewColumn *tvc;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* to test rtl layout, set RTL=1 in the environment */
   if (g_getenv ("RTL"))

diff --git a/tests/testimage.c b/tests/testimage.c
index 522b2823785ad6e83db2e04fd4ff630b90b8436d..7f61f7588b6305ea3e1755cb8b4939979127486d 100644 (file)
--- a/tests/testimage.c
+++ b/tests/testimage.c
@@ -87,7 +87,7 @@ main (int argc, char **argv)
   GIcon *icon;
   GFile *file;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (argc > 1)
     icon_name = argv[1];

diff --git a/tests/testinput.c b/tests/testinput.c
index 9c91bf51fae682894fd91cd9884e1c5ce54549ef..38899ca4edde981796d52803a7ebaa64b740fb55 100644 (file)
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -238,7 +238,7 @@ main (int argc, char *argv[])
   GdkWindow *gdk_win;
   GdkSeat *seat;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   seat = gdk_display_get_default_seat (gdk_display_get_default ());
 

diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index 94bd6b85c079100cee72b7ca35d190d7da391a15..fe412d0fa76fe54aa1c37e4ebf480438f00d6f23 100644 (file)
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -137,7 +137,7 @@ kinetic_scrolling (void)
 int
 main (int argc, char **argv)
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   kinetic_scrolling ();
 

diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index ccf4141cbd0ec640eae49ac1c08d0653e156a66e..23385f86ae20b1db3e10e0cc84b698e14b8f7e55 100644 (file)
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   GtkWidget *box2;
   GtkWidget *sw;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   add_custom_css ();
 

diff --git a/tests/testlist.c b/tests/testlist.c
index 06f98fd311a49faec75fdd055208283400003465..05daa901806e848519014cbf24cab0f80eba95bf 100644 (file)
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -255,7 +255,7 @@ main (int argc, char *argv[])
   GtkWidget *window, *hbox, *vbox, *list, *row, *row3, *row_vbox, *row_hbox, *l;
   GtkWidget *check, *button, *combo, *scrolled;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

diff --git a/tests/testlist2.c b/tests/testlist2.c
index 5f0a09e2a5f306f9d3ce26ccb84220ad18ca4a93..d00421c32c34ba356d59973868b8f38ba667b1e0 100644 (file)
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -102,7 +102,7 @@ int main (int argc, char *argv[])
   gint i;
   gchar *text;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);

diff --git a/tests/testlist3.c b/tests/testlist3.c
index 9ebd1c1cca98b545001828e613685bc0fec27066..14e4fbe812ee45a4521a7319f5e20ddd4e58cba2 100644 (file)
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   gint i;
   gchar *text;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 300);

diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c
index f64cea88828590755c44949ad282a204ada868d6..d6c3cff98aa06f7b73de8cd2ac39c1583a03c0c7 100644 (file)
--- a/tests/testlockbutton.c
+++ b/tests/testlockbutton.c
@@ -218,7 +218,7 @@ main (int argc, char *argv[])
   GtkWidget *update;
   GPermission *permission;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   permission = g_object_new (G_TYPE_TEST_PERMISSION, NULL);
 

diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c
index d51133ed4a890baf7004cc7031429c5ec536c021..7df63c8907609fad1457797a5341fe22533ab155 100644 (file)
--- a/tests/testmenubutton.c
+++ b/tests/testmenubutton.c
@@ -46,7 +46,7 @@ int main (int argc, char **argv)
        guint row = 0;
        GMenu *menu;
 
-       gtk_init (&argc, &argv);
+       gtk_init ();
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_window_resize (GTK_WINDOW (window), 400, 300);

diff --git a/tests/testmountoperation.c b/tests/testmountoperation.c
index 3887c31f3256993c10e3fb2e6f94decb63ddf90b..0a707e2e0c7fbdbdd2d17e2e12bcf25c9ff7dddd 100644 (file)
--- a/tests/testmountoperation.c
+++ b/tests/testmountoperation.c
@@ -106,13 +106,19 @@ main (int argc, char *argv[])
     { "no-pw-save", 's', 0, G_OPTION_ARG_NONE, &dont_save_password, "Don't show password save options.", NULL },
     { NULL }
   };
+  GOptionContext *context;
 
-  if (!gtk_init_with_args (&argc, &argv, "", options, NULL, &error))
+  context = g_option_context_new ("");
+  g_option_context_add_main_entries (context, options, NULL);
+  if (!g_option_context_parse (context, &argc, &argv, &error))
     {
       g_print ("Failed to parse args: %s\n", error->message);
       g_error_free (error);
       return 1;
     }
+  g_option_context_free (context);
+
+  gtk_init ();
 
   if (force_rtl)
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index 0b28b47e0982eebc5a7b617a98ad654dce6756c9..8ad28190ea8fd14d6806540725ddbdaceb2fc131 100644 (file)
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   GdkScreen *scr2 = NULL;      /* Quiet GCC */
   gboolean correct_second_display = FALSE;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (argc == 2)
     screen2_name = g_strdup (argv[1]);

diff --git a/tests/testnoscreen.c b/tests/testnoscreen.c
index edc71e872e78cf043bb99829ced7747c0e78ef61..baaaa8c8584d07a05397cdfcab658747742d7736 100644 (file)
--- a/tests/testnoscreen.c
+++ b/tests/testnoscreen.c
@@ -26,8 +26,12 @@ int main (int argc, char *argv[])
   GtkWidget *window;
   GtkWidget *button;
   GdkDisplay *display;
+  gboolean has_display;
 
-  gtk_parse_args (&argc, &argv);
+  gdk_set_allowed_backends ("x11");
+  g_unsetenv ("DISPLAY");
+  has_display = gtk_init_check ();
+  g_assert (!has_display);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   button = gtk_button_new ();

diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 436baabfe810f05b68eda2d150ade1e754b9c6fe..6ee3cfbbf043db76af0eecce38baa15bb4b8cdec 100644 (file)
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -320,7 +320,7 @@ main (gint argc, gchar *argv[])
 {
   GtkWidget *window, *grid;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   grid = gtk_grid_new ();

diff --git a/tests/testorientable.c b/tests/testorientable.c
index e778eacdacc1744c355a36b21772e5a29c4b15b0..d089f5e7cb65c95cb238dd366571b3d13ce676af 100644 (file)
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -51,7 +51,7 @@ main (int argc, char **argv)
   GtkWidget *box, *button;
   GList *orientables = NULL;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   grid= gtk_grid_new ();

diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 88a8be95f25e7a53e64bc28024e8cde2022ef8db..4b60f5403ab703ca0597b8d1393f33b99dbe2dc0 100644 (file)
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -549,7 +549,7 @@ main (int argc, char *argv[])
   GtkWidget *win9;
   GtkCssProvider *css_provider;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index f93eba616dfdc26f8b638f1e56c5a047fb174f40..8ca78ae998458f41c7c91c796964910112251bba 100644 (file)
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   GtkCssProvider *provider;
   gchar *str;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider,

diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c
index 73bbf9a1cfadb63a921e48648d6a2bef2931d1de..434336cc26ab04008223bea1d27aab90261cf2b6 100644 (file)
--- a/tests/testpixbuf-scale.c
+++ b/tests/testpixbuf-scale.c
@@ -67,7 +67,7 @@ main(int argc, char **argv)
         const gchar *creator;
         GError *error;
 
-       gtk_init (&argc, &argv);
+       gtk_init ();
 
        if (argc != 2) {
                fprintf (stderr, "Usage: testpixbuf-scale FILE\n");

diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index 4a87e3b40873ea9fcbaaf087836f2ca405039c88..91d5e6aff67d7ba7d8a5f2d7ecdb70fb40fa442a 100644 (file)
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -8,7 +8,7 @@ main (int argc, char *argv[])
   GtkWidget *win;
   GtkWidget *view;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);

diff --git a/tests/testpopover.c b/tests/testpopover.c
index 306e7c9c28b7c491e0e4f1bdd9a4916fde8e632a..5fdd8865a8504025d9971f57ab6f6227b01bb92e 100644 (file)
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
   GtkWidget *check;
   GtkWidget *combo;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);

diff --git a/tests/testpopup.c b/tests/testpopup.c
index 98916c56a1c354255fe3e133d91cc493bdc28fbc..7b3ccfc299f551d470bab2dc4968390bb146e139 100644 (file)
--- a/tests/testpopup.c
+++ b/tests/testpopup.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testpopupat.c b/tests/testpopupat.c
index cf9a4538e8edb1fe8750ca1a3e9becee137d7716..5c0ace65ec200112828f28afae32bd94bba78583 100644 (file)
--- a/tests/testpopupat.c
+++ b/tests/testpopupat.c
@@ -44,7 +44,7 @@ main (int   argc,
   GtkWidget *window;
   GtkWidget *app_chooser_widget;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   builder = gtk_builder_new_from_file ("popupat.ui");
 

diff --git a/tests/testprint.c b/tests/testprint.c
index 5a6e1da650dceae3ea6888098cf65ef702255823..896efeb11481ed38c622352016e2c4ba254ab858 100644 (file)
--- a/tests/testprint.c
+++ b/tests/testprint.c
@@ -98,7 +98,7 @@ main (int argc, char **argv)
   GtkPrintOperation *print;
   TestPrintFileOperation *print_file;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* Test some random drawing, with per-page paper settings */
   print = gtk_print_operation_new ();

diff --git a/tests/testrc.c b/tests/testrc.c
index dd9a29631a9d138a75cbfd319625cc4585bcb7f6..6ef1e0ee4978a7d88f9cb8e3010bdde4e059e8b3 100644 (file)
--- a/tests/testrc.c
+++ b/tests/testrc.c
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 {
   gint i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
   load_types ();
 
   for (i = 0; tests[i].test; i++)

diff --git a/tests/testrecentchooser.c b/tests/testrecentchooser.c
index 4ac0722c4c763068563a1d0c45051e2c0bfb8b4d..fcc32a39bc51387eae36da747016b13288486f6e 100644 (file)
--- a/tests/testrecentchooser.c
+++ b/tests/testrecentchooser.c
@@ -111,7 +111,7 @@ main (int   argc,
   gint i;
   gboolean multiple = FALSE;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* to test rtl layout, set RTL=1 in the environment */
   if (g_getenv ("RTL"))

diff --git a/tests/testrecentchoosermenu.c b/tests/testrecentchoosermenu.c
index 0c644b92ce0e85c5ea1489f2ab95f1fbc2e10766..110b9677cea9b8ed9f613ccf6419339971072b64 100644 (file)
--- a/tests/testrecentchoosermenu.c
+++ b/tests/testrecentchoosermenu.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
   GtkWidget *button;
   GtkAccelGroup *accel_group;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   manager = gtk_recent_manager_get_default ();
 

diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 2de4c576b901a6f217905860869e2545a300ea2b..9059cd3ade9f2baf5ba8a679aa15f37b69971d2d 100644 (file)
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -6,7 +6,7 @@ main (gint argc,
 {
   GtkWidget *window, *revealer, *box, *widget, *entry;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_size_request (window, 300, 300);

diff --git a/tests/testrichtext.c b/tests/testrichtext.c
index 7da1bef897bdd0406440ae58eb884990e9b0bc96..7572599fc64a983d3a422e8f1bdc8d3040228396 100644 (file)
--- a/tests/testrichtext.c
+++ b/tests/testrichtext.c
@@ -143,7 +143,7 @@ main (gint   argc,
   GdkAtom        atom;
   guint          i, broken = 0;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* initialize random numbers, disable this for deterministic testing */
   if (1)        

diff --git a/tests/testscale.c b/tests/testscale.c
index a8294ca4a3effe0779ea60ddda3bcf22693d17ca..a74613c8318336f5a5d635c4acd3abfaaf634097 100644 (file)
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
   gdouble pos_marks[4] = { 0.0, 33.3, 66.6, 100.0 };
   const gchar *pos_labels[4] = { "Left", "Right", "Top", "Bottom" };
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Ranges with marks");

diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 094d3764c6aee2752aef501539b2204ea91d2408..b1e04dcc8b638556438d3745df00c6c3b15b38ac 100644 (file)
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
   GtkWidget *overlay;
   GtkWidget *label;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (win), 600, 400);

diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index cecc1770b1fed8d3b6b0bf51c92135ce37745e12..87da5ad93d95916c71979fd1b37d29c6f89cd1dd 100644 (file)
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -364,7 +364,7 @@ scrollable_policy (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   scrollable_policy ();
 

diff --git a/tests/testselection.c b/tests/testselection.c
index 7176985590e844a0c547b8d59d9b1704e04a36ee..9f5d07309acdaf924604dcfb25a2123a0384dbe4 100644 (file)
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -402,7 +402,7 @@ main (int argc, char *argv[])
   };
   static gint ntargets = sizeof(targetlist) / sizeof(targetlist[0]);
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   init_atoms();
 

diff --git a/tests/testselectionmode.c b/tests/testselectionmode.c
index 6cea2b105267c1149c21a1aef511c017de71ae4b..dfb8c4da04a02ffb30656f15a4c5fed2ed893fed 100644 (file)
--- a/tests/testselectionmode.c
+++ b/tests/testselectionmode.c
@@ -179,7 +179,7 @@ main (int argc, char *argv[])
   GSimpleActionGroup *group;
   GSimpleAction *action;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   builder = gtk_builder_new_from_file ("selectionmode.ui");
   window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));

diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index 7ecaf365e1ba43d5c10f7c4bf1814c2f17457a3a..7e3edaa59793f7e932aea8d3ded9f83d86d460e6 100644 (file)
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
   GtkWidget *bu;
   GtkWidget *w, *c;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);

diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 686de064b3efd1103f352a9748dac097bc8f5874..24c80bf4e74daddc2aa37a8f01f62a796c445156 100644 (file)
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -68,7 +68,7 @@ prepare_window_for_orientation (GtkOrientation orientation)
 int
 main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   prepare_window_for_orientation (GTK_ORIENTATION_HORIZONTAL);
   prepare_window_for_orientation (GTK_ORIENTATION_VERTICAL);

diff --git a/tests/testsplitheaders.c b/tests/testsplitheaders.c
index 5becbdb0c3a775f1158773951706ba3ac2981b99..42de06d74f11e5e236a26c513642e5d10f8b8143 100644 (file)
--- a/tests/testsplitheaders.c
+++ b/tests/testsplitheaders.c
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   GtkWidget *check;
   GtkWidget *header;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   builder = gtk_builder_new_from_file ("testsplitheaders.ui");
 

diff --git a/tests/teststack.c b/tests/teststack.c
index 9e0dcf89b2039011ae7e47e154c99982f38d61ed..48dba7ef23eb6de54b59b8cc9c09766e7fe86d05 100644 (file)
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -118,7 +118,7 @@ main (gint argc,
   GtkTreeIter iter;
   GEnumClass *class;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_size_request (window, 300, 300);

diff --git a/tests/teststackedheaders.c b/tests/teststackedheaders.c
index 53470db8a6f2dacd376a085b57c5547642e5b2d8..830e9da7612b93b9164ca3505a0775a72b859fdb 100644 (file)
--- a/tests/teststackedheaders.c
+++ b/tests/teststackedheaders.c
@@ -23,7 +23,7 @@ main (int argc, char *argv[])
   GtkBuilder *builder;
   GtkWidget *win;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   builder = gtk_builder_new ();
   gtk_builder_add_callback_symbol (builder, "back_to_main", G_CALLBACK (back_to_main));

diff --git a/tests/testswitch.c b/tests/testswitch.c
index ee0a56984666d555d04cfdd5e0fcebb0524b8d33..0d07327ce0a391ae4faac21f40337c311515f321 100644 (file)
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -156,7 +156,7 @@ int main (int argc, char *argv[])
   GtkWidget *window;
   GtkWidget *vbox, *hbox;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "GtkSwitch");

diff --git a/tests/testtextview.c b/tests/testtextview.c
index 0cfd0a15edf4b84e3f57344efa78c16569f28577..e6d74b9f5e1fdc1fa8094479b438b0ad559486c3 100644 (file)
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -196,7 +196,7 @@ main (int argc, char **argv)
   GtkTextBuffer *buffer;
   GtkTextChildAnchor *anchor;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window   = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   sw       = gtk_scrolled_window_new (NULL, NULL);

diff --git a/tests/testthreads.c b/tests/testthreads.c
index 867e44b6143983fda4e2bfecba6ad134baa5e89e..8c4c8d58b77c1c8eef6ecf658c7e6fe4386c8e00 100644 (file)
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
       exit(1);
     }
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   pthread_mutex_lock (&nthreads_mutex);
 

diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index d284b52cee44d5d7fb6fcce1e386775b5b5a450e..116201fcde264e7b83c6a4cd75b4a3d44b234b38 100644 (file)
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -490,7 +490,7 @@ main (gint argc, gchar **argv)
   GIcon *gicon;
   GSList *group;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testtoolbar2.c b/tests/testtoolbar2.c
index 211958f871851dc0d77bf62d41d6e24e0b0eefe8..878f43aff14247f3baeae05817484897da57d4a0 100644 (file)
--- a/tests/testtoolbar2.c
+++ b/tests/testtoolbar2.c
@@ -9,7 +9,7 @@ int main (int argc, char *argv[])
   GtkWidget *view;
   GtkWidget *button;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 7a064c40d55af7f38428f10a3a33ce790a5d5e0a..1d071e2f600a249d8045b5da04a4af927781643f 100644 (file)
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -262,7 +262,7 @@ main (int argc, char *argv[])
 
   gchar *text, *markup;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Tooltips test");

diff --git a/tests/testtoplevelembed.c b/tests/testtoplevelembed.c
index 31561b85589afea62a0c13a3d2ebe3181989b8ae..4df5aec021837122f243ded6abf8da73bc9c5251 100644 (file)
--- a/tests/testtoplevelembed.c
+++ b/tests/testtoplevelembed.c
@@ -57,7 +57,7 @@ main (gint argc, gchar **argv)
   GtkWidget *window;
   GtkWidget *widget;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Toplevel widget embedding example");

diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index f974486736ce4bc296185fe458ed986588715d63..76bd4e32bdec603bdfa73495f8c397dc3d011ef1 100644 (file)
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -474,7 +474,7 @@ main (int    argc,
   GtkTreeModel *model;
   guint i;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index d6d3d77aa4a1c3d5c7e89fd5c0ad9580ac67bb0b..2d71118ddb6f85e3347db9ca2fb9e6fef4899f06 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -720,7 +720,7 @@ main (int argc, char *argv[])
   GtkTreeModel *sample_model;
   gint i;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* First initialize all the models for signal purposes */
   left_tree_model = (GtkTreeModel *) gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);

diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index c3ade30ad5f30379fe6ea78679aa3ae515c7be33..7be0a1cba3aa9eda28a8a909dee916be142d7f0c 100644 (file)
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -170,7 +170,7 @@ main (int argc, char **argv)
   GtkWidget *tree_view;
   GtkWidget *button;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /* Window and box */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 0a84ec3b8aada90fba7827670c05f08d5eeab431..c308d454266c601d2ff89af4e0b73ceb374b9a44 100644 (file)
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
   GtkWidget *window;
   GtkWidget *box;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 

diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 994f0342c13606784af3339f676e342262d769a0..1b3b8bfcf52d631f5b551ae04be695c7748c4777 100644 (file)
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -229,7 +229,7 @@ main (gint argc, gchar **argv)
   GtkCellArea *area;
   CallbackData callback[4];
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index 6c73ab656a06c18392bb0d8dfe86379281ddf65f..7ac171ca79f18bcf17ba1047d378e748307d8e52 100644 (file)
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   GtkWidget *button;
   GtkTreePath *path;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   path = gtk_tree_path_new_from_string ("80");
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 6841101a52cc3047dc9a2f19ec0ab436894c708c..c32258d72565083e894507f9569c9b2b897d8500 100644 (file)
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -346,7 +346,7 @@ main (int argc, char *argv[])
   gint col_offset;
   GtkTreeViewColumn *column;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");

diff --git a/tests/testtreemenu.c b/tests/testtreemenu.c
index 13680842508c0a92dd833fb7dec982054f190605..3d2417ba973e7ae8e52fc03108af138cebd15f58 100644 (file)
--- a/tests/testtreemenu.c
+++ b/tests/testtreemenu.c
@@ -545,7 +545,7 @@ tree_menu (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   tree_menu ();
 

diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c
index c240b18aa9f21989853d376e94ab672f53f3ed1d..031dab580a307b9d25bd4b6bf2fe8d43a05ddf3d 100644 (file)
--- a/tests/testtreemodel.c
+++ b/tests/testtreemodel.c
@@ -256,8 +256,12 @@ int
 main (int argc, char *argv[])
 {
   GtkTreeModel *model;
-  
-  gtk_init_with_args (&argc, &argv, NULL, entries, NULL, NULL);
+  GOptionContext *context;
+
+  context = g_option_context_new ("");
+  g_option_context_add_main_entries (context, entries, NULL);
+  g_option_context_parse (context, &argc, &argv, NULL);
+  gtk_init ();
 
   model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING));
   

diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index 77cf205dd32f17e1909887fab4166a337b651bc6..ad2cbd0fee842a2947f26105a77b9e87afc9b493 100644 (file)
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -91,7 +91,7 @@ int main (int argc, char *argv[])
   GtkTreeStore *store;
   GtkTreeIter iter;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   sw = gtk_scrolled_window_new (NULL, NULL);

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 8239ad26ec5c8febe93701e643a1029e3827b317..80ac65eb981d6d29b831caf4121b6d3598eadeb4 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
   GtkWidget *window2, *vbox2, *scrolled_window2, *tree_view2;
   GtkWidget *window3, *vbox3, *scrolled_window3, *tree_view3;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   /**
    * First window - Just a GtkTreeStore

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 8e0039582090bf0d2f3ec6c0e2d0201b7c81e072..def4ebff3f3842e4a848a9555a873268de73cb86 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -663,7 +663,7 @@ main (int    argc,
   GtkTreeModel *model;
   gint i;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index e9e2bcd4927920b9c4d13b257e12c59fd2a7cdbf..a25abf6328e6feeaf0bfcc29fa53b56fa4b0fd51 100644 (file)
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -299,7 +299,7 @@ main (gint argc, gchar **argv)
   GtkTreeViewColumn *column;
   GtkCellArea *area;
   
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);

diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index 0dfcc673fef3218b75cd00956403e6115543fb79..611a2941e22be336e764acfc453f57f8d6a6dd2b 100644 (file)
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -82,7 +82,7 @@ main (int    argc,
   GtkWidget *box;
   GtkWidget *vbox;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);

diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index 8a763990777211d68e61088eb00dc79d23a617d8..95e23b6d488f63422544da83b8b57115a11086c7 100644 (file)
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -136,7 +136,7 @@ create_window (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   create_window ();
 

diff --git a/tests/testxinerama.c b/tests/testxinerama.c
index 538460bd120564b89107e6f50e1767f5a2b492b0..38550f4a60e84e5f437b5830d1ae8ea50c00ad6c 100644 (file)
--- a/tests/testxinerama.c
+++ b/tests/testxinerama.c
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
   GdkDisplay *display;
   gint i, num_monitors;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   display = gdk_display_get_default ();
 

diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index f930a388db810fd5cc849d666da37c2284a5b4ce..45fee12e326b044657d1dff4e3f2bb99c2a66789 100644 (file)
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -439,7 +439,7 @@ make_window (gint view_type)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   base_model = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 

diff --git a/tests/video-timer.c b/tests/video-timer.c
index d0d3bc52cac1fdaced341619f40c5a6779e8c727..1a68a7bdd2fdc6447913fc51aa78daa7e3dead3d 100644 (file)
--- a/tests/video-timer.c
+++ b/tests/video-timer.c
@@ -365,14 +365,21 @@ main(int argc, char **argv)
   GtkWidget *da;
   GError *error = NULL;
   GdkFrameClock *frame_clock;
+  GOptionContext *context;
 
-  if (!gtk_init_with_args (&argc, &argv, "",
-                           options, NULL, &error))
+  context = g_option_context_new ("");
+  g_option_context_add_main_entries (context, options, NULL);
+
+  if (!g_option_context_parse (context, &argc, &argv, &error))
     {
       g_printerr ("Option parsing failed: %s\n", error->message);
       return 1;
     }
 
+  g_option_context_free (context);
+
+  gtk_init ();
+
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   g_signal_connect (window, "destroy",

diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c
index 5dc9530beeba22a74d50e12493566a8c5389d78e..27c2904d2019dd00a86d2ca67d90a19bcc3e285f 100644 (file)
--- a/tests/visuals/visuals.c
+++ b/tests/visuals/visuals.c
@@ -62,7 +62,7 @@ main (int argc, char *argv[])
   GtkWidget  *window;
   const gchar *filename;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   if (argc < 2)
     return 1;

diff --git a/testsuite/a11y/derive.c b/testsuite/a11y/derive.c
index 6ecb47cf1d637660afef4660179b9f37b4841725..b9e4d4d41cbc8e1df32534186a2e5e9eb681fda8 100644 (file)
--- a/testsuite/a11y/derive.c
+++ b/testsuite/a11y/derive.c
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
   GtkWidget *widget;
   GtkAccessible *accessible;
 
-  gtk_init (NULL, NULL);
+  gtk_init ();
 
   widget = GTK_WIDGET (g_object_new (my_button_get_type (), NULL));
   accessible = GTK_ACCESSIBLE (gtk_widget_get_accessible (widget));

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index b8cbca3e12814714d40cfce9e45231d1af1f05bf..03cb57746817f94f3f81759100ed41736f9fe11c 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -5,13 +5,13 @@ NULL=
 noinst_PROGRAMS = $(TEST_PROGS)
 
 AM_CPPFLAGS =                          \
-       $(GDK_DEP_CFLAGS)               \
+       $(GTK_DEP_CFLAGS)               \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        $(NULL)
 
 LDADD =                                \
-       $(GDK_DEP_LIBS)                 \
+       $(GTK_DEP_LIBS)                 \
        $(top_builddir)/gtk/libgtk-4.la \
        $(NULL)
 

diff --git a/testsuite/gdk/cairo.c b/testsuite/gdk/cairo.c
index 77be879c974b112daff66a6ad6c2bcd403e86d9f..071ca33767740f1ccbc4cd1db22de7e3b0cce9a8 100644 (file)
--- a/testsuite/gdk/cairo.c
+++ b/testsuite/gdk/cairo.c
@@ -1,4 +1,4 @@
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static void
 test_set_source_big_pixbuf (void)
@@ -32,7 +32,7 @@ int
 main (int argc, char *argv[])
 {
   g_test_init (&argc, &argv, NULL);
-  gdk_init (&argc, &argv);
+  gtk_init ();
 
   g_test_add_func ("/drawing/set-source-big-pixbuf", test_set_source_big_pixbuf);
 

diff --git a/testsuite/gdk/cursor.c b/testsuite/gdk/cursor.c
index 5ae3bc064ee15ecb84dcaa9906c4b3434fb92acc..ec2997a60044b88f0c3179186b4db26a455e85f7 100644 (file)
--- a/testsuite/gdk/cursor.c
+++ b/testsuite/gdk/cursor.c
@@ -1,4 +1,4 @@
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static char *cursor_names[] = {
   "none",
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   char *test_name;
 
   g_test_init (&argc, &argv, NULL);
-  gdk_init (NULL, NULL);
+  gtk_init ();
 
   for (i = 0; i < G_N_ELEMENTS (cursor_names); i++)
     {

diff --git a/testsuite/gdk/display.c b/testsuite/gdk/display.c
index 297c8e8ae4cfd7389748e182b8c98ad20f9737c5..c5b3b1641a14d504a086fa95fa15f1fd2273c9f8 100644 (file)
--- a/testsuite/gdk/display.c
+++ b/testsuite/gdk/display.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static void
 test_unset_display_subprocess1 (void)
@@ -9,7 +9,7 @@ test_unset_display_subprocess1 (void)
 
   g_unsetenv ("DISPLAY");
 
-  g_assert (!gdk_init_check (NULL, NULL));
+  g_assert (!gtk_init_check ());
   manager = gdk_display_manager_get ();
   g_assert (manager != NULL);
   g_assert (gdk_display_manager_get_default_display (manager) == NULL);
@@ -20,7 +20,7 @@ test_unset_display_subprocess2 (void)
 {
   g_unsetenv ("DISPLAY");
 
-  gdk_init (NULL, NULL);
+  gtk_init ();
 }
 
 static void
@@ -41,7 +41,7 @@ test_bad_display_subprocess1 (void)
 
   g_setenv ("DISPLAY", "poo", TRUE);
 
-  g_assert (!gdk_init_check (NULL, NULL));
+  g_assert (!gtk_init_check ());
   manager = gdk_display_manager_get ();
   g_assert (manager != NULL);
   g_assert (gdk_display_manager_get_default_display (manager) == NULL);
@@ -51,7 +51,7 @@ static void
 test_bad_display_subprocess2 (void)
 {
   g_setenv ("DISPLAY", "poo", TRUE);
-  gdk_init (NULL, NULL);
+  gtk_init ();
 }
 
 static void

diff --git a/testsuite/gdk/encoding.c b/testsuite/gdk/encoding.c
index 6ae96095d6d60f576ea131f083e4d838cec2689c..016d1cee288cb71bef5223df76de1f6e9a4e5d2d 100644 (file)
--- a/testsuite/gdk/encoding.c
+++ b/testsuite/gdk/encoding.c
@@ -1,4 +1,4 @@
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
 #endif
@@ -38,7 +38,7 @@ int
 main (int argc, char *argv[])
 {
   g_test_init (&argc, &argv, NULL);
-  gdk_init (&argc, &argv);
+  gtk_init ();
 
   g_test_add_func ("/encoding/to-text-list", test_to_text_list);
 

diff --git a/testsuite/gdk/keysyms.c b/testsuite/gdk/keysyms.c
index 7d786f557c3d56d91384258dfaaace60f659b6e3..dc94faec2302ab32e86a467618b2b670df5c0a7e 100644 (file)
--- a/testsuite/gdk/keysyms.c
+++ b/testsuite/gdk/keysyms.c
@@ -1,5 +1,5 @@
 #include <locale.h>
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static void
 test_keysyms_basic (void)
@@ -59,7 +59,7 @@ int main (int argc, char *argv[])
   setlocale (LC_ALL, "");
 
   g_test_init (&argc, &argv, NULL);
-  gdk_init (&argc, &argv);
+  gtk_init ();
 
   g_test_add_func ("/keysyms/basic", test_keysyms_basic);
   g_test_add_func ("/keysyms/void", test_keysyms_void);

diff --git a/testsuite/gdk/rectangle.c b/testsuite/gdk/rectangle.c
index 6089ff6ba3e08fb6786b66b533deaece87cfea9e..1b9cbe9135d89fe5f4db6b8333001de6c5204d35 100644 (file)
--- a/testsuite/gdk/rectangle.c
+++ b/testsuite/gdk/rectangle.c
@@ -1,4 +1,4 @@
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static void
 test_rectangle_equal (void)
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
 {
   g_test_init (&argc, &argv, NULL);
 
-  gdk_init (NULL, NULL);
+  gtk_init ();
 
   g_test_bug_base ("http://bugzilla.gnome.org/");
 

diff --git a/testsuite/gdk/seat.c b/testsuite/gdk/seat.c
index 326b70dc893cc3dc19a537a69316a99f93d33d52..8fadb82a6fafa806b416bfbddd0bb1d2dfa4e211 100644 (file)
--- a/testsuite/gdk/seat.c
+++ b/testsuite/gdk/seat.c
@@ -1,4 +1,4 @@
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 static void
 test_list_seats (void)
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
 {
   g_test_init (&argc, &argv, NULL);
 
-  gdk_init (NULL, NULL);
+  gtk_init ();
 
   g_test_bug_base ("http://bugzilla.gnome.org/");
 

diff --git a/testsuite/gtk/accessible.c b/testsuite/gtk/accessible.c
index cdf3253730cb8d510bd42af65b89ca162f3f5261..7f5a034b94f6ab17fbf0e8ac8f1568b45c8523bf 100644 (file)
--- a/testsuite/gtk/accessible.c
+++ b/testsuite/gtk/accessible.c
@@ -24,7 +24,7 @@ main (int argc, char *argv[])
   const GType *tp;
   guint i, n;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   tp = gtk_test_list_all_types (&n);
 

diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c
index da44a0371c52cfc1cdbc0d678037e3f119e2e234..02549a01716d2c25745b378aa3de2eda1bb68cd7 100644 (file)
--- a/testsuite/gtk/cssprovider.c
+++ b/testsuite/gtk/cssprovider.c
@@ -65,7 +65,7 @@ test_section_load_nonexisting_file (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/cssprovider/section-in-load-from-data", test_section_in_load_from_data);

diff --git a/testsuite/gtk/displayclose.c b/testsuite/gtk/displayclose.c
index 39fd794e9240d41792a4c5e49ecd1ba21dea4469..60f90f8f490560aeb59053a1e83f888816d150b3 100644 (file)
--- a/testsuite/gtk/displayclose.c
+++ b/testsuite/gtk/displayclose.c
@@ -6,14 +6,17 @@ main (int argc, char **argv)
   const gchar *display_name;
   GdkDisplay *display;
   GtkWidget *win, *but;
+  gboolean has_display;
 
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
 
-  if (!gtk_parse_args (&argc, &argv))
-    return 1;
+  gdk_set_allowed_backends ("x11");
+  display_name = g_getenv ("DISPLAY");
+  g_unsetenv ("DISPLAY");
+  has_display = gtk_init_check ();
+  g_assert (!has_display);
 
-  display_name = gdk_get_display_arg_name();
-  display = gdk_display_open(display_name);
+  display = gdk_display_open (display_name);
 
   if (!display)
     return 1;

diff --git a/testsuite/gtk/firefox-stylecontext.c b/testsuite/gtk/firefox-stylecontext.c
index 86dc1ee5f04ffc30c72d94df6e3675f3118d5341..f02cb3aaf503015deddc94e260f0bee7cefe638e 100644 (file)
--- a/testsuite/gtk/firefox-stylecontext.c
+++ b/testsuite/gtk/firefox-stylecontext.c
@@ -53,11 +53,7 @@ test_init_of_theme (void)
 int
 main (int argc, char *argv[])
 {
-  /* If gdk_init() is called before gtk_init() the GTK code takes
-   * a different path (why?)
-   */
-  gdk_init (NULL, NULL);
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/style/init_of_theme", test_init_of_theme);

diff --git a/testsuite/gtk/gtkmenu.c b/testsuite/gtk/gtkmenu.c
index e2667ba135d05f125f8095bca871285892435811..c17d50aa75bc8b63649b35203a5f22f22da8061b 100644 (file)
--- a/testsuite/gtk/gtkmenu.c
+++ b/testsuite/gtk/gtkmenu.c
@@ -422,7 +422,7 @@ test_bind_menu (void)
   GRand *rand;
   gint i;
 
-  gtk_init (0, 0);
+  gtk_init ();
 
   rand = g_rand_new_with_seed (g_test_rand_int ());
   model = random_menu_new (rand, TOP_ORDER);

diff --git a/testsuite/gtk/revealer-size.c b/testsuite/gtk/revealer-size.c
index 8c09a491252886852dab62ce94547097349df906..cc1708ab677bdd5d647e30b4e982db282f853452 100644 (file)
--- a/testsuite/gtk/revealer-size.c
+++ b/testsuite/gtk/revealer-size.c
@@ -128,7 +128,7 @@ slide_up_no_animations ()
 int
 main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/sizing/revealer/slide_right_animations", slide_right_animations);

diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
index b62b32393d4fe99fcf201ae925a44f7031c9c17b..f960c383397d05dccd7e6ab684fa0ef6a63c487e 100644 (file)
--- a/testsuite/gtk/scrolledwindow.c
+++ b/testsuite/gtk/scrolledwindow.c
@@ -125,7 +125,7 @@ min_max_content_height (void)
 int
 main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/sizing/scrolledwindow/min_content_width", min_content_width);

diff --git a/testsuite/gtk/stylecontext.c b/testsuite/gtk/stylecontext.c
index 57a8dd53c6c6021099074a2877e4445ee8cd32cf..b66d91739b6b49083651765866b2559e68839610 100644 (file)
--- a/testsuite/gtk/stylecontext.c
+++ b/testsuite/gtk/stylecontext.c
@@ -508,7 +508,7 @@ test_style_priorities_three_context_higher (PrioritiesFixture *f,
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/style/parse/selectors", test_parse_selectors);